From 106e7dd3a9c92f98143b4224e3a6b4de0fd62961 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 11 Mar 2009 10:10:15 +0000 Subject: [PATCH] xend: Test tap devices in testDeviceComplete() XendDomainInfo.testDeviceComplete() should check block devices have shutdown correctly but it only considers vbd class devices and ignores tap devices. The attached patch changes testDeviceComplete() to wait for both vbd and tap devices to be shutdown correctly. Signed-off-by: Jiri Denemark --- tools/python/xen/xend/XendDomainInfo.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index bb0b7f23cb..88a2c2f5eb 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -2888,7 +2888,9 @@ class XendDomainInfo: while True: test = 0 diff = time.time() - start - for i in self.getDeviceController('vbd').deviceIDs(): + vbds = self.getDeviceController('vbd').deviceIDs() + taps = self.getDeviceController('tap').deviceIDs() + for i in vbds + taps: test = 1 log.info("Dev %s still active, looping...", i) time.sleep(0.1) -- 2.30.2